Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 12 Mar 2010 15:04:35 +0000 (15:04 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 12 Mar 2010 15:04:35 +0000 (15:04 +0000)

Trivial merge